added a new conditional CROSS_COMPILING which indicates ($build != $host).

2002-05-07  Michael Natterer  <mitch@gimp.org>

	* configure.in: added a new conditional CROSS_COMPILING which
	indicates ($build != $host). If it is set, look for
	gdk-pixbuf-csource in PATH. Error out if it was not found.

	* gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at
	configure time if CROSS_COMPILING is set, use the one which was
	just built otherwise.

diff --git a/ChangeLog b/ChangeLog
index 49cacd3b380d7741a0520abe91010ad812fb9a9e..3d6f1addb828b9deed4d6001f0579e515db207c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-07  Michael Natterer  <mitch@gimp.org>
+
+       * configure.in: added a new conditional CROSS_COMPILING which
+       indicates ($build != $host). If it is set, look for
+       gdk-pixbuf-csource in PATH. Error out if it was not found.
+
+       * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at
+       configure time if CROSS_COMPILING is set, use the one which was
+       just built otherwise.
+
 2002-05-07  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/xsettings-client.c (xsettings_client_process_event): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 49cacd3b380d7741a0520abe91010ad812fb9a9e..3d6f1addb828b9deed4d6001f0579e515db207c9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2002-05-07  Michael Natterer  <mitch@gimp.org>
+
+       * configure.in: added a new conditional CROSS_COMPILING which
+       indicates ($build != $host). If it is set, look for
+       gdk-pixbuf-csource in PATH. Error out if it was not found.
+
+       * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at
+       configure time if CROSS_COMPILING is set, use the one which was
+       just built otherwise.
+
 2002-05-07  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/xsettings-client.c (xsettings_client_process_event): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 49cacd3b380d7741a0520abe91010ad812fb9a9e..3d6f1addb828b9deed4d6001f0579e515db207c9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2002-05-07  Michael Natterer  <mitch@gimp.org>
+
+       * configure.in: added a new conditional CROSS_COMPILING which
+       indicates ($build != $host). If it is set, look for
+       gdk-pixbuf-csource in PATH. Error out if it was not found.
+
+       * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at
+       configure time if CROSS_COMPILING is set, use the one which was
+       just built otherwise.
+
 2002-05-07  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/xsettings-client.c (xsettings_client_process_event): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 49cacd3b380d7741a0520abe91010ad812fb9a9e..3d6f1addb828b9deed4d6001f0579e515db207c9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2002-05-07  Michael Natterer  <mitch@gimp.org>
+
+       * configure.in: added a new conditional CROSS_COMPILING which
+       indicates ($build != $host). If it is set, look for
+       gdk-pixbuf-csource in PATH. Error out if it was not found.
+
+       * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at
+       configure time if CROSS_COMPILING is set, use the one which was
+       just built otherwise.
+
 2002-05-07  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/xsettings-client.c (xsettings_client_process_event): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 49cacd3b380d7741a0520abe91010ad812fb9a9e..3d6f1addb828b9deed4d6001f0579e515db207c9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2002-05-07  Michael Natterer  <mitch@gimp.org>
+
+       * configure.in: added a new conditional CROSS_COMPILING which
+       indicates ($build != $host). If it is set, look for
+       gdk-pixbuf-csource in PATH. Error out if it was not found.
+
+       * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at
+       configure time if CROSS_COMPILING is set, use the one which was
+       just built otherwise.
+
 2002-05-07  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/xsettings-client.c (xsettings_client_process_event): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 49cacd3b380d7741a0520abe91010ad812fb9a9e..3d6f1addb828b9deed4d6001f0579e515db207c9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2002-05-07  Michael Natterer  <mitch@gimp.org>
+
+       * configure.in: added a new conditional CROSS_COMPILING which
+       indicates ($build != $host). If it is set, look for
+       gdk-pixbuf-csource in PATH. Error out if it was not found.
+
+       * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at
+       configure time if CROSS_COMPILING is set, use the one which was
+       just built otherwise.
+
 2002-05-07  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/xsettings-client.c (xsettings_client_process_event): 

diff --git a/configure.in b/configure.in
index 0ab5f7aef283679ad77739e80e3e1228e149603b..40575fb1a711ef877d22371f4cdfd2e6fa1fd230 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -879,6 +879,16 @@ fi
 
 AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
 
+dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+
+AM_CONDITIONAL(CROSS_COMPILING, test $build != $host)
+
+if test $CROSS_COMPILING; then
+  AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+  if test x$GDK_PIXBUF_CSOURCE = xno; then
+    AC_MSG_ERROR(Could not find a gdk-pixbuf-csource in your PATH)
+  fi
+fi
 
 GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
 GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"

diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index fdf9421f4ddfa3a108ef796c995f448721773a0f..9fa7c2f677545aeb664b6898f776e66e3dbdcda8 100644 (file)
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -257,20 +257,24 @@ VARIABLES6 = @STRIP_BEGIN@                                                                        \
 noinst_DATA = gtkstockpixbufs.h
 CLEANFILES = $(noinst_DATA)
 
-pixbuf_dir = $(top_builddir)/gdk-pixbuf
+if CROSS_COMPILING
+pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
+else
+pixbuf_csource=GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
+endif
 
-gtkstockpixbufs.h: $(pixbuf_dir)/gdk-pixbuf-csource $(IMAGES)
-       GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-          $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h
-       GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-          $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h
-       GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-          $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h
-       GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-          $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h
-       GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-          $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h
-       GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-          $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h
+gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
+       $(pixbuf_csource) \
+          --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h
+       $(pixbuf_csource) \
+          --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h
+       $(pixbuf_csource) \
+          --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h
+       $(pixbuf_csource) \
+          --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h
+       $(pixbuf_csource) \
+          --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h
+       $(pixbuf_csource) \
+          --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h
 
 EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h